Merge tag 'upstream/2.0.2'
authorPeter Colberg <peter@colberg.org>
Sun, 31 Jul 2016 03:20:28 +0000 (23:20 -0400)
committerPeter Colberg <peter@colberg.org>
Sun, 31 Jul 2016 03:20:28 +0000 (23:20 -0400)
Upstream version 2.0.2


Trivial merge